Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes ads enabled by default for Japan on upgrade - 0.71.x #3721

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Fixes ads enabled by default for Japan on upgrade - 0.71.x #3721

merged 1 commit into from
Oct 17, 2019

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Oct 16, 2019

Fixes brave/brave-browser#6449
Uplift request for #3691

@tmancey tmancey added this to the 0.71.x - Beta milestone Oct 16, 2019
@tmancey tmancey requested a review from a team October 16, 2019 15:34
@tmancey tmancey self-assigned this Oct 16, 2019
@tmancey tmancey changed the title Fixes ads enabled by default for Japan on upgrade Fixes ads enabled by default for Japan on upgrade - 0.71.x Oct 16, 2019
@kjozwiak
Copy link
Member

Restarting on Windows x64 as audit-network failed as per https://staging.ci.brave.com/job/brave-browser-build-pr/job/issues%252F6449-0.71.x/1/execution/node/506/log/. Example:

13:32:26  [33726/38528] ACTION //brave/components/brave_rewards/resources/internals:internals(//build/toolchain/win:win_clang_x64)
13:32:44  [33727/38528] ACTION //brave/components/brave_rewards/resources/page:page(//build/toolchain/win:win_clang_x64)
13:32:44  [33728/38528] ACTION //brave/components/brave_rewards/resources/tip:tip(//build/toolchain/win:win_clang_x64)
13:32:44  ninja: build stopped: subcommand failed.
13:32:44  null
13:32:44  powershell.exe : null
13:32:44  At C:\71.x@tmp\durable-24333a43\powershellWrapper.ps1:3 char:1
13:32:44  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
13:32:44  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13:32:44      + CategoryInfo          : NotSpecified: (null:String) [], RemoteException
13:32:44      + FullyQualifiedErrorId : NativeCommandError

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Oct 16, 2019
@kjozwiak
Copy link
Member

Looks like https://staging.ci.brave.com/job/brave-browser-build-pr/job/issues%252F6449-0.71.x/2/execution/node/327/log/ failed... Going to restart Win x64 one more time.

kjozwiak
kjozwiak approved these changes Oct 17, 2019
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 0.71.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues. @btlechowski also QA'd the fix on Nightly via #3691 (comment) 👍

Please make sure that all correct labels are being used and the associated issue is moved into the correct milestone.

@tmancey tmancey merged commit f668ceb into 0.71.x Oct 17, 2019
@tmancey tmancey deleted the issues/6449-0.71.x branch October 17, 2019 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@tmancey tmancey

Labels
bug CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 feature/ads feature/rewards
Projects
None yet
Milestone
1.0.0 - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@tmancey @kjozwiak